Exercise 4.7 class complete